Refactoring To Java 8